Updated map handler to include position