Added missing @Override annotations. Updated mappings.