Added state migration