Creation of new files added
Missing final replacement in java file & correct java types