Added more valid characters to attributes name and vales.