Preparing for AbstractCommand addition