Added ability to omit protocol