Improve sdk form