Added support for a baseline number of keys