Feature/key with single annotation

Add support for key of the (type, annotation) pair.