Updated map for entry!