justj-10: Refactoring, Add Optional Fields Support