additional parameter handling unified