Refactor DefaultInstanceService