Unity with refactored core