Added some init code