CDI-110

Added new annotations and updated spec