Changed return datastructure