Added some implementation classes