Refactoring
Add rest specs