Merge "Add parameters in init function"