Added filters, decorators and backlog