Added dynamic handler loading