Added notations for implements and changed some