Added states, removed solaris support