Add support for Mass Import