:lipstick: Simplify specs a bit
Update CHANGELOG.md