Prepared 0.8.0 extras