Change parameters order
Restore constructor with configuration