Add bucket and key as fields