changes in OffsetManager as per review