fixed: validation + schemas