Update package name and add multi-line support