Added wandboard support