Added new types to architecture impl