1.x support

In progress