Added check for max number of plans, including account/plan association