Add more flexibility