Add import roles functional, minor fixes