Fixed import problems for this version