Area implementation adoption to the new API (in progress)