Components structure fix