Added more customization