Updated to work with latest 'core'