Issue-2: Add discriminator and subTypes based on JsontypeInfo and JsonSubTypes annotations.
Issue-2: Improving model simplification.
Merge pull request #3 from jlagerweij/feature/Issue-2

Feature/issue 2