Updated initialization methods