Did some changes to get feed validated