Change to gem construcations