Refactory
New base class for the Models