Changed returned array structure to older style for legacy support