Added ActiveArea management. Cleanup