LRA-181 : Add improvements