[RICPLT-2523] Improvements...