Re-added default values (for direct API usage) and updated docs