Improve import syntax (restrict to functions of interest)