refactor to avoid Vector in DB signature