* Avoid type conflict * Prettier format * Make extras optional * Rename extras to keyValues * Remove empty initial object