Fixed import and class name issues