adding support for includeKeys