Changes to make it more CLI-friendly