Move helper method out of common module