AdditionalFacades: Update documentation & tweak code