(DI-1705) Best practices