Feature/also tail producer support