Added some better defaults