Added unit limitations