Added init logic
Added init logic