Added filtering on types