Added schema checks for existence