Added some boiler-plate code