Added v 0.5.7+ compatibility