Refactor + dummy domain spec