Updated handlers

Updated handlers