More work on server's entities