Added embedded sql expressions as fields