Added HTML Invjection support