Add macro handling extensions and line substitution support.