Added generic sink factories