Map interface improved