Refactored pos domains and changed references