Adding socket and pipe support