Added some more code to presenter classes