Modernize gem source