Refactor
Add new specs