Replaced with CLI variant