add advanced availability mapping for decoration