changes to support server API