Added more configurability