Add support for custom limits