change class definition back and include 'require_dependency' calls