Preperation for 0.6.0 changes

compat - ^0.5.0