DDST-58: Addressed feedback