Add more flexibility in the parameters