Added new method from interface change
Renamed internal identifiers