It would be good to add an annotation field to JobSubmitted as well, (of type Option[String]) rather than using string parsing for this.