Refactored future shared_state