Refactor account plan limits