YACC modification for correct components work