v1.0.4 - spec refactor