Optimize keys
Speed up inject
Add partition fn