Updated version numbers

- Added @Override annotations