Added Messages and changed database location