update handler load method

Change-Id: Ie6ce25e1324ccd9363244282b302467e0ed1c4ad