Updated initialization