improved annotation stream implementation