Updated usage of core methods after latest refactoring