Reimplement data structure analysis