Added quota feature, have been tested locally, but no authorization considered