Added support for escape codes