Cleaned up the traits

Working on cleaning the traits to use the new method for saving
attributes