Renamed for convenience.
Added missing SQL functions from another project.