WIP. Separating annotations into two separately managed types