Move away from repository pattern and use named queries