Checked with PMD and Find Bugs - ObjectAid Class diagrams added.