Add support for escaped class names and some cleanup