Improve performance
Update test specs
Rebuild packages