Store clauses in a separate table (thanks to yrashk for first iteration of this patch)