Added default constructor to each wrapper class.
Added null check for wrapping fields
Fixed superclass dependencies.
Changed log information.