options splitted, better enum handling