updated to move security definitions to match schema
added xml name to model