Add Gem support