Added lann/squirrel support