Update to support latest changes to site