Add index
Upgrade to 0.0.7