Update to support latest changes