Bugfix/collection member management