#121 cleaned up Facility interface