Added command annotation support