Feature/upgrade gems