added support for annotation values; added tests accordingly