+ Updated with support for representing components