Removed typecheck for empty validator (it already did that)
Also refactored import * with actual data used