Added init logic