Resolved issue with duplicating menu item, minor changes in domain model