Moving to awestruct 0.5