Added the area system into the master branch