Added some logic for create / delete of collections