added unicode defs on models