Add support for fast returns