Added more parseing for name