Updated Builder, Player,  Components