Added updated annotations to models