Feature/manage list