Update composer itself
Refactor computing to be centralized and cover common cases with unit tests