Cardano internal refactors