Make bay-create operate again as a result of baymodel

Change-Id: Ifa3a44371b5c2f580c0bcdcf03bc96edda23cd3c