Added some classes from old branch