Refactored add_limit to base class