Upgraded "overload" and listing support