Moves some LMS methods to separated classes with backward compatibility