Add more classes and start implementing Projection methods