Props and Decorations and better referencing