Make variable-list dynamic and add support for !include statements