Moved functions into a special trait
Minor change to test