Added multi word name support