New type of options handling and legacy options smooth migration implemented