[Drawing] improved saving and loading state time