Modif
Remove binary
Refactor validation
Composable validator
Add predicate validation