Add economy schema support