Added a few command checks