Added filters, and created EntityStatic