Moved back to core to workaround complex dependencies. Will wait for ERD fix.