Added support for area changing