More string support and component separation.