Added more values to be stored in the database
Switching to database middleware model