Updated code base and init framework