Added rudimentary support for pre