Added more flexibility