Added buffer init