bug109 bug121 added support for new area types