Limits management (23/31)

Limits management