Re add missing support for blocks other than "Definition", update Dockerfile