Modified serverfactory