Updated code to work with latest version of Starcounter