Added key and fixes