Adding init logic