Add return data support