Make parameter handling a bit more flexible