Major updates to move statement creation to SQL class