Refactored to use new interface in core, removed logging