Preparations for handling other commands