Fixed persistence.
Moved AreaShape to separate file.