Replace Vector interface structure with single Layer struct