Add Collection
Remove constructWithArgs, depend on context