Adding export and removal capabilities