Changed DB schema such that pk's are prefixed with the table name. Table names are singular form.