Added some more customization options