some changes for matching spec, TODO: fix our Business Intelligence test