Refactored all point references to activity references