Enhance usability of diplo core