Refactored to used common domain