Added escape for user data