Added missing Override annotations