Updated to include http stack