First pass at refactoring keys handling. Support for :keyfield value on commandline removed