Added some initial classes