follow claroline refactoring