Gem updates
Add validations