Working towards 0.12 compatiblity