Improved annotation usage