Add working list feature