Added handling for 'place' entities