Moved ServerArbiter, moved query to repository