Added some more customizations