moves some value objects
adds the Current qualifier