Prepare V0.8.7 .90 Compat