Refactor - add self reference