Refactor and add the capacity planning compute