use updated canonical methods in core