Changed way components get loaded