[Refactoring] #456 Further development on dustmite integration