Fixed models and unicode issues