ENH: Added search keys dict