Add support for mandatory fields