Add, Edit, Remove work now