Edited database stuff
Adding model changes