Updates to SubmissionStatus annotations and adding contentType to FileEntity