Bringing back datastore attribute for Havana