removed dependency on category mapping