Added more flexibility.