Added filtering by type