Updated API (dev-master 37037e83I