Refactaring
generate
Update spec