Resolve #20 - State