refactor adding trailers in more clean way