Added places dict for improved performances