Added more customizations