Client side refactring for all study annotation types.