added annotated command handlers + command target resolver