Add working server implementations