Migrated to last gems versions