Fixes #15 - refreshes implementation with core-*