Changed initialization methods