Fix: .makeAnnotatable now effective immediately rather than lazy loading