Traffic Shaping

Now that 7.1 is out for testing, we want to experiment with doing traffic shaping in the Mikrotik router using cake. To shape a few thousand users on a dozen various plans, do I need to create 2 queue rules for each user, 1 for upload and 1 for download, or is there some way to just enter their wifi router ip address into an address list for a particular plan and then just create queues for each plans. It seems like a long list of queues if I have to make 2 entries for each user.

I just saw how to do it with address lists and queue trees using mangle to lower the cpu usage, my question would be is we are already marking new incoming packets and connections to load balance our backbone connections with PCC, so how would you mark packets to handle both of these uses as packets can only have one mark.