additional work on server/repository methods