+ Added support for Entity marshalling!