Change state interface

Remove direct access for state setting