Some additional changes to make the gem work