updated handler loading to be more efficient and distinct