Do not export the internal attributes

Also use the new enesim API