Replaced static arguments with dynamic ones