Removed singleton restriction [#2]