Added prehandler logic