SDK improvement #76