Updated code to new tables. Worked on Add Facility