Added support for quota