Added doc annotations