Merges image directive into code directive with consequent changes to Context execute method
Renaming of "output" to "format"