Presence refactor.