Fix import again to make application working as standalone