Some structural changes, makes things more backwards compatible.