Adding state manager