Better init logic