Corrected annotation namespace and added missing annotations.