Added some database tracking + models