Standardize extra parameters and make them modular