Added prefix wi_component and odb_component