Add validation on type and imported state