Fix closure to use data variable
Remove unused method
Add container class
Changes to use container as class loader