Changed implemntation to support new '/' notation