Added some framework to the classes