Added bare collection support