Eliminated SWAITSTATE in SMConstants