Adding oneOf check