Support for Cityscape and clean up DEFINE in ability