Adding State Manager System