New FileR class + code improvements