Added quota support

closes #550