Improve the handling of default methods