Added more quotes and state strings