Change to return as assoc. array.