Map keys refactored.