All SQL-functions moved out of the step-files