Refactor oneOf...