Added map & tile classes