Allow Organization or SoftwareAgent creators
Fixes #18