Added custom table to do some more efficient queries.