Improved model importing so that data needs not to be type of Map.