Changing gfac-core to use app catalog