Added missing @Override annotations