Changed to work with refactored .core