Switched to almost full stackable trait (layer cake) structure