Fix for issue #32: Implement quotas