Adding core and fixing keys storage