WCM-188 Use component instead of static