Added Factories instead of Closures