Changes related to gem