Added models for database and updated watchdog