Added port forwarding for collector and query components