Changes in the base class models. Refactoring commands.