The new object could probably handle these extensions to Submission, instead of using an uncategorized class in lib.