Replace state with more. Fix #95