Added state handler callbacks