Merge "Implemented loader service"