Server poc enhanced