Also, please document the new arguments using Scaladoc.