added support for preloaded entries