Better overload handling