Minor input consistency issue and deprecate dependency functions.