Separate validation by enum