added missing add/remove/list methods
Merge branch 'work' into dev