#1 implemented catalog resolver mechanism