Some interface changes
Gemlock