Updated the base handler