Added capability to use late instantiated classes.
Refactored handler calling.