Changed Item class + adjusted Zone class