adding flexible serverside option support