Modularized the rest of the commands