Added some source files for the new classes