Add and Refresh features finished