Added a few structural changes