Reworking the commands module