Modified factory functions to take arguments, so the minifier can do its work properly