Feature requests about ADR

+1 for this!