Fixed import problems and completed classes method