Added keys to model definition and reworked queries to add populate results.
Haven't updated in a while.