Add handling of initial state