Added in more structure