Improved state creation