Added better markup parser