Changed the ListedKey to be a boolean instead of a string. And, more