Added filter for type transformation