decorator is now splitted in pdfdrawer and tbGenerator