updated access-key handling