Cyclic dependency removed, WeightCategory moved to API