Dro_AS-C_5d refactoring