WIP: simplify request building + include some missing keys