removed the need for pair with AnnotatedValue interface and default implementation.