Added missing permanent properties + experimenting with reordering values etc