Improve the management command to take options