Implement add/remove and sort by creation time