Added some small customizations