Improve derive calculation
Update packaging