Adjusted to new database structure on server