Adding in metadata, added a nodal demand query, added exclusion constraints