Update Gems, add factories