Added some new classes for a new better skeleton