added unicode support to models