added support for 'core'