Simplifed design by removing 'State' class, it's just a String