Moved helpers to common domain