Added key list and Market Mode