Adding some annotations functionalities