FACILITY-30 - Upgrade facility data module to require and take advantage of 1.9