DAO model adaptation for servers view, some repo extensions