Store states in list instead of string