Adopted newer gem format