Handle Optional when saving to db
turn off doclint when generating javadoc (bcause of all the errors)