Added more client code + FeedApi updates