Add user configurable return types