Update Base and Controller comments