Added creation and state