Made more methods command line-friendly