Add more state to initialization