Upgrade to 5.0
add index support