added some types (todo)