Refactor - support for lsdrive added