Added some classes for first implementation.