Fix utils bugs. Updata data sample