Several structural changes