vik-13 and mgechev refactor: add missing import