Move keys into provider, attach provider to details object, use it