Added scatter/gather handlers