Added method replacements and overload resolution