Should we move those into the namespace scope like rest majority code in PS