Added flexible maximum limit