Feature/paginator annotation