Fix includedFields + add implicit Request & Response