Re-added custom return fields