CARE #25: Added comparison entities; added initial query creation view; modified XSD schema