Performance improvements when hitting the database