Refactored library for RModel (same names for function and property)