Some defaults added