Added mapping for hardcoded capability and option names