Add support of method choices