Refactor AdditionalFacades code