Added handling of sub commands via annotations.