Added tails support