Added all needed types (draft version).