FIX #435 Adding loader and control functions