Started on replacing component references to include versions