Refactored schemas for docson usage