v1.0.4 - Spec refactor