Added unit constructor