Added updated SQL structure