Optimizing imports
Bug corections