Re-factored order of constructor parameters.