Added epl support & tagging ability