v1.0.4 - Slight spec refactor