Added some boiler plate classes