Do not return array of array
add support for deannotation