Restored some of the project's classes