Added quota support