More concise mapping