Add block parses variables enhancement