Added aliasing and fixed unicode issues