v1.0.9 - spec refactor