Annotation processing

Adding latest developments.