Add namespace, Fix double quoted return value