Update gems
Refactoring