resolved class import issues