Related: Add support for runtime entryList include