Improve States paste feature