Added more customization options