Added xml, and prep for schema and auto generation