#454 better integration of external component