Added the proper annotations