Updated the class defaults to output more consistent, structured classes