Made the user specific access stuff more generic