Commercial: component correct wrapper