Updated Java types according to new design