improvement to schemas, still need to fix up race schema