Added mulitple name support