Adding features for Annotations and preparing for related tests.