v1.0.3 - Spec refactors