Added missing @Override annotations for clarity