Added return of keys