Added feed addition logic, also add some minor changes