Moved keys to app