More commands using prepare()

BUG-ID:  N/A