Fixed init to be generic