Added service and improved bluetooth robustness