component wrapper model - improvements