UPDATE: add struct types