[UPDATE] Better depth compatibility with old orm version