Original PropertyLoader reworked @ SEN