ApiServer improvements