Fx: use GenericType instead of JavaWrapper