Combining add/list functionality