Added two base classes for module controls