Final v0.1.1 setup