Added Dashboard support.