Added states support