Add more @Override annotations