Added some extra defaults