Added category and tweaked model associations