Changes to have it working with v server