Reorganized constructor parameters.