Modified: Heavy annotations refactoring (UNFINISHED).