New schema for Klick
Merged upstream
Updated server