Updated SQLMaker