Adding Structure to Momentum