Limits management (25/31)

Limits management