Refactor Acuity Context Load