Update class structure for compiled-time annotation checking