More additions of prepare() to commands.