Updates Dec 2014

Lot of updates on the structure framework.