Use maps instead of keywords
Remove unused spec field