Added Validator and Expander objects