Including active and passive endpoints and resolved cookie problem