Added support for function-bound rates