add missing import
add callback handler
update default container
fix namespace and class name