Move define to separate file, change catalog logic