Improved mobility routines