Changing to Object Generic types to be able to use the javaxb.