Added some defaults