Models updated to match Java API