Added LBS support