Added support for scalar values and annotations...