Improves spec implementation

[skip ci]