Re-implement quota support