Improve multi-methods