improved schema doc and labelHelper