[WIP] Validation improvements