Added command types and renamed it for more clarity