Move to more lightweight design, only copy references
All references now