Added helpers function from Support Component, removed OptionUtil class