Validation: Fix generics