Simplifications and addition of expat and regex