initial version of the server adapter rework