#254 Implement new option field functionality