Updated the facility module to be inline with latest versions