Updating relation support and adding filter utility class