Added @Override annotations that I previously forgot