Further implementation of state system