add tajo and update other components