Include availability in a cleaner way
Update gems