Removing collection reactivity and simplify return options