Updates to definition manager, support for validation