It sounds like you are doing this correctly. These tiered structures can be a pain. Bill accordingly.
