Add validation
FIX all utilities