Re-enabled kwargs for submit and others