Fixed installation issues, optimized import