Working on the States configuration