Yes agreed. I'll refactor when I implement for SQL.