Improved annotation import