Added data send type, improvements