Update to allow several components per template position