Added keys & marked optional.