Added more name support