Break out functions into new namespace