Added states and related updates