Moved two methods into a trait where they need to be