Updated intialization