Refactored initialisation of commercial components