FG: adding more types