Presence checks refactored