Add support for retrieving light weight entries