Renamed handler arguments for consistency