Extract Unit to top-level