refactored catalog to be optionally application aware