Improve on demand logic description