Support a few more gem parameters - take 2