Revamping and supporting 0.8.0