Make new_state and expand members