Added types (see issues)