Redisigning state mechanism