The changes fixes such it work with 1.0

Its also back compatible.