Added handling of bufferred points data