More obvious naming, only one call to DB class