Merge "Refactoring to support more annotation types."